Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 21 Jan 2011 20:27:07 +0000 (12:27 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 21 Jan 2011 20:27:07 +0000 (12:27 -0800)

Trivial merge